From c8f0d210fbd15911f0d9fec5d88da6f0eb48e46e Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 24 Apr 2006 09:27:40 +0000 Subject: [PATCH] Declare GtkPrintJob. 2006-04-24 Alexander Larsson * gtk/gtkprintjob.h: Declare GtkPrintJob. * gtk/gtkprintunixdialog.c: (gtk_print_unix_dialog_get_settings): Change g_return_if_fail to g_return_val_if_fail. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ gtk/gtkprintjob.h | 1 + gtk/gtkprintunixdialog.c | 2 +- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 279837cf88..ecc5736985 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-04-24 Alexander Larsson + + * gtk/gtkprintjob.h: + Declare GtkPrintJob. + + * gtk/gtkprintunixdialog.c: (gtk_print_unix_dialog_get_settings): + Change g_return_if_fail to g_return_val_if_fail. + 2006-04-24 Alexander Larsson * configure.in: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 279837cf88..ecc5736985 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2006-04-24 Alexander Larsson + + * gtk/gtkprintjob.h: + Declare GtkPrintJob. + + * gtk/gtkprintunixdialog.c: (gtk_print_unix_dialog_get_settings): + Change g_return_if_fail to g_return_val_if_fail. + 2006-04-24 Alexander Larsson * configure.in: diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h index 2999001249..6b9cfeb0ed 100644 --- a/gtk/gtkprintjob.h +++ b/gtk/gtkprintjob.h @@ -35,6 +35,7 @@ G_BEGIN_DECLS #define GTK_PRINT_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINT_JOB, GtkPrintJobClass)) +typedef struct _GtkPrintJob GtkPrintJob; typedef struct _GtkPrintJobClass GtkPrintJobClass; typedef struct _GtkPrintJobPrivate GtkPrintJobPrivate; diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index e7fc660891..fd86dd8cde 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -2523,7 +2523,7 @@ gtk_print_unix_dialog_get_settings (GtkPrintUnixDialog *dialog) GtkPageRange *ranges; int n_ranges; - g_return_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog)); + g_return_val_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog), NULL); settings = gtk_print_settings_new (); -- 2.30.2